Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 30 Jun 2010 22:57:08 +0000 (22:57 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 30 Jun 2010 22:57:08 +0000 (22:57 +0000)

Trivial merge